projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dd86bd8
)
* keyboard.c (timer_check_2): Add break so timer_check returns next timeout.
author
Jan Djärv
<jan.h.d@swipnet.se>
Mon, 6 Aug 2012 16:09:02 +0000
(18:09 +0200)
committer
Jan Djärv
<jan.h.d@swipnet.se>
Mon, 6 Aug 2012 16:09:02 +0000
(18:09 +0200)
src/ChangeLog
patch
|
blob
|
history
src/keyboard.c
patch
|
blob
|
history
diff --git
a/src/ChangeLog
b/src/ChangeLog
index 5ca15556b14227151ab0ac8f96280dd2e5b712f6..3eb47219f3008c066e5da25d31132ae531742eb6 100644
(file)
--- a/
src/ChangeLog
+++ b/
src/ChangeLog
@@
-1,3
+1,8
@@
+2012-08-06 Jan Djärv <jan.h.d@swipnet.se>
+
+ * keyboard.c (timer_check_2): Add break so timer_check returns next
+ timeout.
+
2012-08-06 Dmitry Antipov <dmantipov@yandex.ru>
Fix Windows build errors introduced after converting to WGET and WSET.
diff --git
a/src/keyboard.c
b/src/keyboard.c
index 758085d3862a1345250633120b6a34062b905776..49ea168240085b5b53e1641f323125bdbb95432d 100644
(file)
--- a/
src/keyboard.c
+++ b/
src/keyboard.c
@@
-4459,6
+4459,7
@@
timer_check_2 (void)
}
nexttime = make_emacs_time (0, 0);
+ break;
}
else
/* When we encounter a timer that is still waiting,